Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

* Switch from setup.py to pyproject.toml #68

Merged
merged 5 commits into from
Dec 16, 2024

Conversation

mkopec87
Copy link
Contributor

@mkopec87 mkopec87 commented Dec 13, 2024

  • Switch from setup.py to pyproject.toml
  • Add numpy<2,pandas<2 test environment to build pipeline test matrix

@mkopec87 mkopec87 marked this pull request as ready for review December 13, 2024 16:13
* Add numpy<2,pandas<2 test environment to build pipeline test matrix
* Refactor build pipeline config file
@mkopec87 mkopec87 force-pushed the feature/switch-to-toml branch from 3517e8d to e65c729 Compare December 13, 2024 16:20
dynamic = ["version"]

[project.optional-dependencies]
test = [
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add the optional dependencies:
`pandas = [
"pandas"
]

spark = [
"pyspark>=3.1; python_version <= '3.11'",
]
`

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

if [ "${{ matrix.numpy_version }}" = "numpy<2" ]; then
pip install ".[test,test_numpy_pre2]"
else
pip install ".[test]"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you switch [test] -> [test,spark] ?
(See also pyproject.toml below).
I think that will trigger the spark tests.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added, seems it works :)

However, should we also add "spark" to "numpy<2" test?
pip install ".[test,spark,test_numpy_pre2]"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. Yes, let's run them there as well.
(Happy to merge when that runs.)

dependencies = [
"numpy",
"tqdm",
"joblib>=0.14.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see that joblib is no longer used. Can you remove it?

if [ "${{ matrix.numpy_version }}" = "numpy<2" ]; then
pip install ".[test,test_numpy_pre2]"
else
pip install ".[test]"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. Yes, let's run them there as well.
(Happy to merge when that runs.)

@mbaak mbaak merged commit c11c45e into histogrammar:master Dec 16, 2024
8 checks passed
@mkopec87 mkopec87 deleted the feature/switch-to-toml branch December 16, 2024 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants